Moved to new error-checking macro and fixed conversion warnings