Merge "dmuserd: Fix error checking"