Restored some error messages

Change-Id: If23acef5f7fa19b868d75c41f604819afe872d18
Signed-off-by: John May <john.wilkinsonmay@gmail.com>