Fixed namespace error, added dictionary error wrapper